Auto merge of #1190 - alexcrichton:issue-1186, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 20 Jan 2015 04:51:54 +0000 (04:51 +0000)
committerbors <bors@rust-lang.org>
Tue, 20 Jan 2015 04:51:54 +0000 (04:51 +0000)
commit838f4b6a70eeb86170850d6d59e2bbbf8e13f28b
tree0df5692918baebd4a97db54928e9218df6aa59c9
parentf1ca1eec53288aa4bc26b3573c5dd06336a8a113
parented1d89c5be3a4b917966c1093557c83ea83d1751
Auto merge of #1190 - alexcrichton:issue-1186, r=alexcrichton

Closes #1186
src/doc/guide.md